include gdkx.h always (for GDK_ROOT_WINDOW)

Tue May 26 15:51:28 1998  Radek Doulik  <gis@academy.cas.cz>

	* gdk/gdk.c: include gdkx.h always (for GDK_ROOT_WINDOW)

diff --git a/ChangeLog b/ChangeLog
index 9c5e2c6ebcfd4377a5132bcf9a8b296c1ed220a3..63934644fd92022fbeab1e1c4b8ef74493a2d9f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 26 15:51:28 1998  Radek Doulik  <gis@academy.cas.cz>
+
+       * gdk/gdk.c: include gdkx.h always (for GDK_ROOT_WINDOW)
+
 Sun May 24 12:11:38 BST 1998  Tony Gale  <gale@gtk.org>
 
         * docs/gtk_tut.sgml:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9c5e2c6ebcfd4377a5132bcf9a8b296c1ed220a3..63934644fd92022fbeab1e1c4b8ef74493a2d9f0 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Tue May 26 15:51:28 1998  Radek Doulik  <gis@academy.cas.cz>
+
+       * gdk/gdk.c: include gdkx.h always (for GDK_ROOT_WINDOW)
+
 Sun May 24 12:11:38 BST 1998  Tony Gale  <gale@gtk.org>
 
         * docs/gtk_tut.sgml:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9c5e2c6ebcfd4377a5132bcf9a8b296c1ed220a3..63934644fd92022fbeab1e1c4b8ef74493a2d9f0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Tue May 26 15:51:28 1998  Radek Doulik  <gis@academy.cas.cz>
+
+       * gdk/gdk.c: include gdkx.h always (for GDK_ROOT_WINDOW)
+
 Sun May 24 12:11:38 BST 1998  Tony Gale  <gale@gtk.org>
 
         * docs/gtk_tut.sgml:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9c5e2c6ebcfd4377a5132bcf9a8b296c1ed220a3..63934644fd92022fbeab1e1c4b8ef74493a2d9f0 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Tue May 26 15:51:28 1998  Radek Doulik  <gis@academy.cas.cz>
+
+       * gdk/gdk.c: include gdkx.h always (for GDK_ROOT_WINDOW)
+
 Sun May 24 12:11:38 BST 1998  Tony Gale  <gale@gtk.org>
 
         * docs/gtk_tut.sgml:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9c5e2c6ebcfd4377a5132bcf9a8b296c1ed220a3..63934644fd92022fbeab1e1c4b8ef74493a2d9f0 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Tue May 26 15:51:28 1998  Radek Doulik  <gis@academy.cas.cz>
+
+       * gdk/gdk.c: include gdkx.h always (for GDK_ROOT_WINDOW)
+
 Sun May 24 12:11:38 BST 1998  Tony Gale  <gale@gtk.org>
 
         * docs/gtk_tut.sgml:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9c5e2c6ebcfd4377a5132bcf9a8b296c1ed220a3..63934644fd92022fbeab1e1c4b8ef74493a2d9f0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Tue May 26 15:51:28 1998  Radek Doulik  <gis@academy.cas.cz>
+
+       * gdk/gdk.c: include gdkx.h always (for GDK_ROOT_WINDOW)
+
 Sun May 24 12:11:38 BST 1998  Tony Gale  <gale@gtk.org>
 
         * docs/gtk_tut.sgml:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9c5e2c6ebcfd4377a5132bcf9a8b296c1ed220a3..63934644fd92022fbeab1e1c4b8ef74493a2d9f0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Tue May 26 15:51:28 1998  Radek Doulik  <gis@academy.cas.cz>
+
+       * gdk/gdk.c: include gdkx.h always (for GDK_ROOT_WINDOW)
+
 Sun May 24 12:11:38 BST 1998  Tony Gale  <gale@gtk.org>
 
         * docs/gtk_tut.sgml:

diff --git a/gdk/gdk.c b/gdk/gdk.c
index 78d979514e25f6241d351181975f58ef2e6874ca..8e05fd57af27a6839ae76c6fe13bf48d2247edb1 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -49,9 +49,7 @@
 #include "gdk.h"
 #include "gdkprivate.h"
 #include "gdkinput.h"
-#ifdef USE_XIM
 #include "gdkx.h"
-#endif
 #include "gdkkeysyms.h"
 #include "gdki18n.h"
 

diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 78d979514e25f6241d351181975f58ef2e6874ca..8e05fd57af27a6839ae76c6fe13bf48d2247edb1 100644 (file)
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -49,9 +49,7 @@
 #include "gdk.h"
 #include "gdkprivate.h"
 #include "gdkinput.h"
-#ifdef USE_XIM
 #include "gdkx.h"
-#endif
 #include "gdkkeysyms.h"
 #include "gdki18n.h"